Simplify autopkgtest now that test-local-pull seems to be stable

diff --git a/debian/changelog b/debian/changelog
index c18ad73bf19c4dc827c6210be23b60019fc34bc3..7bf642b062464d8e517d7d4684886fb1cc4a7851 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ostree (2017.12-1) UNRELEASED; urgency=medium
     - Drop all current patches, applied upstream
     - Update symbols file
   * Add some post-release bug fix patches
+  * Simplify autopkgtest now that test-local-pull seems to be stable
 
  -- Simon McVittie <smcv@debian.org>  Tue, 03 Oct 2017 19:14:14 +0100
 

diff --git a/debian/tests/control b/debian/tests/control
index 5c627361429f5a75746bae57fef3354566deb859..88ffde7f521cb59890ff1513a9c9e55dabe0cc93 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
-Tests: gnome-desktop-testing, test-local-pull
+Tests: gnome-desktop-testing
 Depends: gnome-desktop-testing, ostree-tests
 
 Tests: build

diff --git a/debian/tests/gnome-desktop-testing b/debian/tests/gnome-desktop-testing
index b5d57a760ff599da9f2f66848df8d665949e192d..c6a077dd098f2fcb46670b392930b810d00e08cb 100755 (executable)
--- a/debian/tests/gnome-desktop-testing
+++ b/debian/tests/gnome-desktop-testing
@@ -3,20 +3,4 @@
 set -e
 exec 2>&1
 
-e=0
-
-tests="$(gnome-desktop-testing-runner -l libostree | while read t; do
-       t="${t%% *}"
-
-       case "$t" in
-               (libostree/test-local-pull.sh.test)
-                       # frequently times out, https://bugs.debian.org/842606
-                       # https://github.com/ostreedev/ostree/issues/605
-                       continue
-                       ;;
-       esac
-
-       echo "$t"
-done)"
-
-gnome-desktop-testing-runner $tests
+exec gnome-desktop-testing-runner libostree

diff --git a/debian/tests/test-local-pull b/debian/tests/test-local-pull
deleted file mode 100755 (executable)
index ab4e5fe..0000000
--- a/debian/tests/test-local-pull
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-set -e
-exec 2>&1
-
-N=3
-passed=0
-
-for i in `seq 1 $N`; do
-       if gnome-desktop-testing-runner libostree/test-local-pull.sh.test; then
-               passed=$(( $passed + 1))
-       fi
-done
-
-echo "test-local-pull: passed $passed/$N attempts"
-
-if [ "$passed" -ne "$N" ]; then
-       exit 1
-fi